fixes for #722, Mechanically remove QStringRef use for QStringView to help with Qt6...

* Fix typo in maggeo from search-and-replace work earlier.

* Revert startOfDate() calls to keep floor at 5.12.x to keep builders happy. :-/

* Explictly get QString from StringView in gpx for compat with older Qt builds.

Co-authored-by: Robert Lipe <robertlipe@gmail.com>

diff --git a/gpx.cc b/gpx.cc
index 3f9e78494bbf805f0eeb174ccd8b32b8adf299f8..d587c83ee47fd4194402576525541c57e0c4308e 100644 (file)
--- a/gpx.cc
+++ b/gpx.cc
@@ -894,7 +894,7 @@ void
 GpxFormat::gpx_cdata(const QStringView& s)
 {
   QString* cdata;
-  cdatastr += s;
+  cdatastr += s.toString();
 
   if (!cur_tag) {
     return;

diff --git a/maggeo.cc b/maggeo.cc
index fd3c1f16c0a860ec3d51a87b68f1474366905de5..004dc9964a79e55ec9f0d63b357775537fd85df7 100644 (file)
--- a/maggeo.cc
+++ b/maggeo.cc
@@ -194,7 +194,7 @@ static QDateTime maggeo_parsedate(char* dmy)
   int d = date.midRef(0,2).toInt();
   int m = date.midRef(2,2).toInt();
   int y = date.midRef(4,3).toInt();
-  QDateTime r(QDate(y + 1900, m, d)::startOfDay());
+  QDateTime r(QDate(y + 1900, m, d));
   return r;
 }
 

diff --git a/xcsv.cc b/xcsv.cc
index e6ea0397fdc1bb74537bb33fa68541bb42cbfec4..7e5a6009dbba857aa64853204b6c44762fcd113a 100644 (file)
--- a/xcsv.cc
+++ b/xcsv.cc
@@ -258,7 +258,7 @@ QDateTime
 XcsvFormat::yyyymmdd_to_time(const char* s)
 {
   QDate d = QDate::fromString(s, "yyyyMMdd");
-  return QDateTime(d.startOfDay());
+  return QDateTime(d);
 }